Refactor the return statement